bitkeeper revision 1.1062.3.4 (40f2b160cK4vITpgYulcbL0jKHqM4A)

Debug prints and small fix to ioctxt struct.

diff --git a/tools/xfrd/xen_domain.c b/tools/xfrd/xen_domain.c
index d0f73e5b20289b9c58f2895a5503e1ba8e918e6d..adef919af18faa87507ce7716e37d1f75b6c37dd 100644 (file)
--- a/tools/xfrd/xen_domain.c
+++ b/tools/xfrd/xen_domain.c
@@ -18,9 +18,13 @@
 
 #ifndef _XEN_XFR_STUB_
 static int domain_suspend(u32 dom, void *data){
+    int err = 0;
     Conn *xend = data;
 
-    return xfr_vm_suspend(xend, dom);
+    dprintf("> dom=%lu data=%p\n", dom, data);
+    err = xfr_vm_suspend(xend, dom);
+    dprintf("< err=%d\n", err);
+    return err;
 }
 
 static int xc_handle = 0;
@@ -29,6 +33,7 @@ int xcinit(void){
     if(xc_handle <= 0){
         xc_handle = xc_interface_open();
     }
+    dprintf("< xc_handle=%d\n", xc_handle);
     return xc_handle;
 }
 
@@ -72,6 +77,7 @@ int xen_domain_snd(Conn *xend, IOStream *io, uint32_t dom, char *vmconfig, int v
 #else 
     XcIOContext _ioctxt = {}, *ioctxt = &_ioctxt;
     dprintf("> dom=%d\n", dom);
+    ioctxt->domain = dom;
     ioctxt->io = io;
     ioctxt->info = iostdout;
     ioctxt->err = iostderr;

diff --git a/tools/xfrd/xfrd.c b/tools/xfrd/xfrd.c
index 7f3f63f47d17f3996c8503d50c5c1bae060a2a64..301674b1fe6c94ac3059d4c1c7712de4e6ae320c 100644 (file)
--- a/tools/xfrd/xfrd.c
+++ b/tools/xfrd/xfrd.c
@@ -711,8 +711,10 @@ int xfr_save(Args *args, XfrState *state, Conn *xend, char *file){
     int err = 0;
     IOStream *io = NULL;
 
+    dprintf("> file=%s\n", file);
     io = file_stream_fopen(file, "wb");
     if(!io){
+        dprintf("> Failed to open %s\n", file);
         err = -EIO;
         goto exit;
     }
@@ -727,6 +729,7 @@ int xfr_save(Args *args, XfrState *state, Conn *xend, char *file){
         IOStream_close(io);
         IOStream_free(io);
     }
+    dprintf("< err=%d\n", err);
     return err;
 }